From 61398ae70069f660ff06a723a6daba83e499df2b Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Tue, 25 Jul 2017 21:30:57 +0100 Subject: [PATCH] no-openssl don't add -lssl etc if not needed (because we use system-postgresql) Gbp-Pq: Name no-openssl.diff --- RepositoryExternal.mk | 72 +------------------ config_host.mk.in | 4 -- configure.ac | Bin 456230 -> 454368 bytes connectivity/Library_postgresql-sdbc-impl.mk | 1 - external/Module_external.mk | 1 - external/libxmlsec/ExternalProject_xmlsec.mk | 2 - oox/CppunitTest_oox_tokenmap.mk | 9 --- oox/Library_oox.mk | 9 --- ucb/CppunitTest_ucb_webdav_local_neon.mk | 1 - ucb/CppunitTest_ucb_webdav_neon_opts.mk | 1 - ucb/CppunitTest_ucb_webdav_propfindcache.mk | 1 - ucb/CppunitTest_ucb_webdav_res_access.mk | 1 - ucb/Library_ucpdav1.mk | 2 - xmlsecurity/Library_xsec_xmlsec.mk | 9 --- 14 files changed, 2 insertions(+), 111 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3bbcace7f5c..f412d087108 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1482,75 +1482,6 @@ endef endif # SYSTEM_HARFBUZZ -ifeq ($(DISABLE_OPENSSL),TRUE) - -gb_ExternalProject__use_openssl:= -gb_LinkTarget__use_openssl_headers:= -gb_LinkTarget__use_openssl:= - -else # !DISABLE_OPENSSL - -ifneq ($(SYSTEM_OPENSSL),) - -gb_LinkTarget__use_openssl_headers:= -gb_ExternalProject__use_openssl:= - -define gb_LinkTarget__use_openssl -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(OPENSSL_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),$(OPENSSL_LIBS)) - -endef - -else # !SYSTEM_OPENSSL - -$(eval $(call gb_Helper_register_packages_for_install,ooo, \ - openssl \ -)) - -define gb_ExternalProject__use_openssl -$(call gb_ExternalProject_use_package,$(1),openssl) - -endef - -define gb_LinkTarget__use_openssl_headers -$(call gb_LinkTarget_use_external_project,$(1),openssl) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,openssl)/include \ - $$(INCLUDE) \ -) - -endef - -define gb_LinkTarget__use_openssl -$(call gb_LinkTarget_use_package,$(1),openssl) -ifeq ($(OS),WNT) -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/ssleay32.lib \ - $(call gb_UnpackedTarball_get_dir,openssl)/out32dll/libeay32.lib \ -) -else -$(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,openssl)/libssl.a \ - $(call gb_UnpackedTarball_get_dir,openssl)/libcrypto.a \ -) -$(call gb_LinkTarget_use_external_project,$(1),openssl) -ifeq ($(OS),SOLARIS) -$(call gb_LinkTarget_add_libs,$(1),\ - -lnsl \ - -lsocket \ -) -endif -endif - -endef - -endif # SYSTEM_OPENSSL -endif # DISABLE_OPENSSL - - ifeq ($(DISABLE_OPENSSL),TRUE) define gb_LinkTarget__use_gnutls @@ -2969,9 +2900,10 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,postgresql)/src/interfaces/libpq/libpq$(gb_StaticLibrary_PLAINEXT) \ ) -ifeq ($(OS),WNT) $(call gb_LinkTarget_use_external,$(1),openssl) +ifeq ($(OS),WNT) + $(call gb_LinkTarget_use_system_win32_libs,$(1),\ secur32 \ ws2_32 \ diff --git a/config_host.mk.in b/config_host.mk.in index a5b76255adf..6e70361eb3e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -96,7 +96,6 @@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ export DISABLE_CVE_TESTS=@DISABLE_CVE_TESTS@ export DISABLE_DYNLOADING=@DISABLE_DYNLOADING@ -export DISABLE_OPENSSL=@DISABLE_OPENSSL@ export DISABLE_PYTHON=@DISABLE_PYTHON@ export DLOPEN_LIBS=@DLOPEN_LIBS@ export DLLTOOL=@DLLTOOL@ @@ -418,8 +417,6 @@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ export OOO_VENDOR=@OOO_VENDOR@ export OPENCOLLADA_CFLAGS=$(gb_SPACE)@OPENCOLLADA_CFLAGS@ export OPENCOLLADA_LIBS=$(gb_SPACE)@OPENCOLLADA_LIBS@ -export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ -export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@ export OS=@OS@ @@ -548,7 +545,6 @@ export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@ export SYSTEM_ODFGEN=@SYSTEM_ODFGEN@ export SYSTEM_OPENCOLLADA=@SYSTEM_OPENCOLLADA@ export SYSTEM_OPENLDAP=@SYSTEM_OPENLDAP@ -export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@ export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@ export SYSTEM_POPPLER=@SYSTEM_POPPLER@ export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@ diff --git a/configure.ac b/configure.ac index c347a5532c96cf4a06d50279e29a6bea912a558b..c6ac44cb2a25f61804c1386a1f8fa9d2cb0f3600 100644 GIT binary patch delta 29 lcmZ4XM*6{B>4p}@7N!>F7M3ln8A|QzG+DQ=(`2hS0|2=z3!VS~ delta 1262 zcmcgrO>f*(6jl5&nGT3ZO+N`lx6Vfs5l?1l+94_vG5Kf+nr6~E5uh*{JoZcc%8Q@t z=V>~tWRWUjgDSDO8w4sy>?*YqQa4qF1l?64e*jeWmG}!hdpv_^S>uhZ`+Uwl_q=z~YKknXfK2YHLfYmQ}@bca-6i zE){l@5va)@Wf5A!-X>VdYA5l7KeQ|^o>z`z;g;HuckifKd~n!z47U!|0en2FX8Qo| z-BJhVI#4RWB|%6WJ0dRZdc=oji!zt`+pxt$C>HW1kZ&f>!+Z|XX9S18>C0a(%@i)p z&Rm+__1Y#CrX2)~m|Z?eVRlAgCiTr7+u_127R-{#DEAYB3#FOT#o6M_G^0%?YzGnV zp^0nq1Y}Co?SF7N{BBG+^+sY5EBic=gg>9whu=<{)u%R7x8zs1Hi>_Ys;5@UV62j8 z-dZ%kyW>wBBfSv&iGEZLgP$c)2@Kai>7EMMQQ$Zdz!ElnB_d+wtxb-v#aijS{}fLgT8n z-1xY1eRX29CJ*C$?RmC@GscNb_B2-X{|XxGC^B+eG?$YO pSsU}#`o!i-w}RK6WY#d)*E9J1g{tAVs&?$~rlCK&X=M1bzX9!^leGW< diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 2ff0b635b89..b1c5f22aad7 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -45,7 +45,6 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ boost_headers \ postgresql \ $(if $(filter-out MSC,$(COM)), \ - openssl \ openldap \ nss3 \ plc4 \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 2f5373535f7..c5dc50b1abd 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -79,7 +79,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,ODFGEN,libodfgen) \ $(call gb_Helper_optional,OPENCOLLADA,opencollada) \ $(call gb_Helper_optional,OPENLDAP,openldap) \ - $(call gb_Helper_optional,OPENSSL,openssl) \ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \ $(call gb_Helper_optional,PAGEMAKER,libpagemaker) \ diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index 66abd02ac3a..1c33fcb7ea8 100644 --- a/external/libxmlsec/ExternalProject_xmlsec.mk +++ b/external/libxmlsec/ExternalProject_xmlsec.mk @@ -13,8 +13,6 @@ $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2)) $(eval $(call gb_ExternalProject_use_external,xmlsec,nss3)) -$(eval $(call gb_ExternalProject_use_external,xmlsec,openssl)) - $(eval $(call gb_ExternalProject_register_targets,xmlsec,\ build \ )) diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk index 1ef9d85bc62..464be672caf 100644 --- a/oox/CppunitTest_oox_tokenmap.mk +++ b/oox/CppunitTest_oox_tokenmap.mk @@ -20,19 +20,10 @@ $(eval $(call gb_CppunitTest_use_sdk_api,oox_tokenmap)) $(eval $(call gb_CppunitTest_use_library_objects,oox_tokenmap,oox)) -ifeq ($(TLS),OPENSSL) -$(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\ - openssl \ - openssl_headers \ -)) -else -ifeq ($(TLS),NSS) $(eval $(call gb_CppunitTest_use_externals,oox_tokenmap,\ plc4 \ nss3 \ )) -endif -endif $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\ basegfx \ diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 632f09bf01e..8f727174fd5 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -66,19 +66,10 @@ $(eval $(call gb_Library_use_externals,oox,\ boost_headers \ )) -ifeq ($(TLS),OPENSSL) -$(eval $(call gb_Library_use_externals,oox,\ - openssl \ - openssl_headers \ -)) -else -ifeq ($(TLS),NSS) $(eval $(call gb_Library_use_externals,oox,\ plc4 \ nss3 \ )) -endif -endif $(eval $(call gb_Library_set_componentfile,oox,oox/util/oox)) diff --git a/ucb/CppunitTest_ucb_webdav_local_neon.mk b/ucb/CppunitTest_ucb_webdav_local_neon.mk index df16e36409b..28fa8216883 100644 --- a/ucb/CppunitTest_ucb_webdav_local_neon.mk +++ b/ucb/CppunitTest_ucb_webdav_local_neon.mk @@ -31,7 +31,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_local_neon,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_local_neon,\ diff --git a/ucb/CppunitTest_ucb_webdav_neon_opts.mk b/ucb/CppunitTest_ucb_webdav_neon_opts.mk index 91e167b083a..21e52573f86 100644 --- a/ucb/CppunitTest_ucb_webdav_neon_opts.mk +++ b/ucb/CppunitTest_ucb_webdav_neon_opts.mk @@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_neon_opts,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_neon_opts,\ diff --git a/ucb/CppunitTest_ucb_webdav_propfindcache.mk b/ucb/CppunitTest_ucb_webdav_propfindcache.mk index ebbaee7898e..e2d064ef034 100644 --- a/ucb/CppunitTest_ucb_webdav_propfindcache.mk +++ b/ucb/CppunitTest_ucb_webdav_propfindcache.mk @@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_propfindcache,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_propfindcache,\ diff --git a/ucb/CppunitTest_ucb_webdav_res_access.mk b/ucb/CppunitTest_ucb_webdav_res_access.mk index ac48f87bc87..c7d151ea40d 100644 --- a/ucb/CppunitTest_ucb_webdav_res_access.mk +++ b/ucb/CppunitTest_ucb_webdav_res_access.mk @@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_use_externals,ucb_webdav_res_access,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_CppunitTest_use_custom_headers,ucb_webdav_res_access,\ diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk index f4afd730c74..7016cf223d9 100644 --- a/ucb/Library_ucpdav1.mk +++ b/ucb/Library_ucpdav1.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ libxml2 \ neon \ - openssl \ )) $(eval $(call gb_Library_use_custom_headers,ucpdav1,\ @@ -72,7 +71,6 @@ else # WITH_WEBDAV == serf $(eval $(call gb_Library_use_externals,ucpdav1,\ boost_headers \ apr \ - openssl \ serf \ zlib \ )) diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk index 5c3e20a9b97..3abc7305f0b 100644 --- a/xmlsecurity/Library_xsec_xmlsec.mk +++ b/xmlsecurity/Library_xsec_xmlsec.mk @@ -128,13 +128,6 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\ -DXMLSEC_CRYPTO_NSS \ )) -ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_add_libs,xsec_xmlsec,\ - $(call gb_UnpackedTarball_get_dir,xmlsec)/src/openssl/.libs/libxmlsec1-openssl.a \ - $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \ -)) -else - ifeq ($(SYSTEM_XMLSEC),) $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \ @@ -142,8 +135,6 @@ $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ )) endif -endif - $(eval $(call gb_Library_use_externals,xsec_xmlsec,\ plc4 \ )) -- 2.30.2